gtk/gtkobject.c s/GtkType/GType/ and

2008-09-23  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkobject.c
	* gtk/gtksignal.[ch]: s/GtkType/GType/ and
	s/GtkSignalMarshaller/GSignalCMarshaller/.

svn path=/trunk/; revision=21498

diff --git a/ChangeLog b/ChangeLog
index 74a223164c9f27f54570889e4148d7b27b20c4f5..460af28c66fc8b4c625740a73dddd15d434c21be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-23  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkobject.c
+       * gtk/gtksignal.[ch]: s/GtkType/GType/ and
+       s/GtkSignalMarshaller/GSignalCMarshaller/.
+
 2008-09-23  Michael Natterer  <mitch@imendio.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): remove unused

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 89d940edc237b60f36b7e660c1ba50367cd191fe..a90f26bb6936cfb9ebf0a9d0df4ad5dba6d70b97 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -216,7 +216,7 @@ gtk_arg_proxy_get_property (GObject     *object,
 
 void
 gtk_object_add_arg_type (const gchar *arg_name,
-                        GtkType      arg_type,
+                        GType        arg_type,
                         guint        arg_flags,
                         guint        arg_id)
 {
@@ -593,7 +593,7 @@ gtk_object_notify_weaks (GtkObject *object)
 }
 
 GtkObject*
-gtk_object_new (GtkType      object_type,
+gtk_object_new (GType        object_type,
                const gchar *first_property_name,
                ...)
 {

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 3016dcc986204959488b64e3538732c8542cec37..c855582da52456731835298e6c2fa46b918126e7 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -34,12 +34,12 @@
 guint
 gtk_signal_newv (const gchar         *name,
                 GtkSignalRunType     signal_flags,
-                GtkType              object_type,
+                GType                object_type,
                 guint                function_offset,
-                GtkSignalMarshaller  marshaller,
-                GtkType              return_val,
+                GSignalCMarshaller   marshaller,
+                GType                return_val,
                 guint                n_params,
-                GtkType             *params)
+                GType               *params)
 {
   GClosure *closure;
   
@@ -54,14 +54,14 @@ gtk_signal_newv (const gchar         *name,
 guint
 gtk_signal_new (const gchar         *name,
                GtkSignalRunType     signal_flags,
-               GtkType              object_type,
+               GType                object_type,
                guint                function_offset,
-               GtkSignalMarshaller  marshaller,
-               GtkType              return_val,
+               GSignalCMarshaller   marshaller,
+               GType                return_val,
                guint                n_params,
                ...)
 {
-  GtkType *params;
+  GType *params;
   guint signal_id;
   
   if (n_params)
@@ -69,10 +69,10 @@ gtk_signal_new (const gchar         *name,
       va_list args;
       guint i;
       
-      params = g_new (GtkType, n_params);
+      params = g_new (GType, n_params);
       va_start (args, n_params);
       for (i = 0; i < n_params; i++)
-       params[i] = va_arg (args, GtkType);
+       params[i] = va_arg (args, GType);
       va_end (args);
     }
   else

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 8a4654f84924580d2c29b366ed4ce389ce44eb54..dbb5c430b6bb08908d70785d077b71ae8d1f455b 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -93,7 +93,7 @@ guint gtk_signal_newv                         (const gchar        *name,
                                                 GtkSignalRunType    signal_flags,
                                                 GType               object_type,
                                                 guint               function_offset,
-                                                GtkSignalMarshaller marshaller,
+                                                GSignalCMarshaller  marshaller,
                                                 GType               return_val,
                                                 guint               n_args,
                                                 GType              *args);
@@ -101,7 +101,7 @@ guint       gtk_signal_new                          (const gchar        *name,
                                                 GtkSignalRunType    signal_flags,
                                                 GType               object_type,
                                                 guint               function_offset,
-                                                GtkSignalMarshaller marshaller,
+                                                GSignalCMarshaller  marshaller,
                                                 GType               return_val,
                                                 guint               n_args,
                                                 ...);